Merge branch 'display-buffer'
authorjustbur <justin@burkett.cc>
Fri, 3 Jul 2015 12:07:02 +0000 (08:07 -0400)
committerjustbur <justin@burkett.cc>
Fri, 3 Jul 2015 12:07:02 +0000 (08:07 -0400)

Trivial merge